# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1046.327.7 -> 1.1046.327.8
#	     kernel/printk.c	1.26    -> 1.27   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/06/17	greg@kroah.com	1.1046.338.1
# Merge kroah.com:/home/greg/linux/BK/bleed-2.5
# into kroah.com:/home/greg/linux/BK/gregkh-2.5
# --------------------------------------------
# 03/06/18	paulus@samba.org	1.1046.339.1
# Merge samba.org:/stuff/paulus/kernel/linux-2.5
# into samba.org:/stuff/paulus/kernel/for-linus-ppc
# --------------------------------------------
# 03/06/17	torvalds@home.transmeta.com	1.1046.340.1
# Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.5
# into home.transmeta.com:/home/torvalds/v2.5/linux
# --------------------------------------------
# 03/06/17	Ballabio_Dario@emc.com	1.1046.340.2
# [PATCH] eata and u14-34f update
# 
# Here enclosed an update for the new IRQ and module_param APIs.
# eata.h and u14-34f.h are no longer used and will be deleted.
# --------------------------------------------
# 03/06/19	agrover@groveronline.com	1.1046.336.2
# ACPI: Interpreter update to 20030619
# - Fix To/FromBCD, eliminating the need for an arch-specific #define
# - Do not acquire a semaphore in the S5 shutdown path
# - Fix ex_digits_needed for 0 (Takayoshi Kochi)
# - Fix sleep/stall code reversal (Andi Kleen)
# - Revert a change having to do with control method calling semantics
# --------------------------------------------
# 03/06/18	chadt@sgi.com	1.1046.327.8
# [PATCH] ia64: early_printk for SGI SN2
# 
# --------------------------------------------
#
diff -Nru a/kernel/printk.c b/kernel/printk.c
--- a/kernel/printk.c	Mon Sep 22 12:58:47 2003
+++ b/kernel/printk.c	Mon Sep 22 12:58:47 2003
@@ -784,6 +784,10 @@
 
 # endif /* CONFIG_IA64_EARLY_PRINTK_UART */
 
+#ifdef CONFIG_IA64_EARLY_PRINTK_SGI_SN
+extern int sn_sal_console_out(const char *str, int len);
+#endif
+
 void early_printk(const char *str, size_t len)
 {
 #ifdef CONFIG_IA64_EARLY_PRINTK_UART
@@ -791,6 +795,9 @@
 #endif
 #ifdef CONFIG_IA64_EARLY_PRINTK_VGA
 	early_printk_vga(str, len);
+#endif
+#ifdef CONFIG_IA64_EARLY_PRINTK_SGI_SN
+ 	sn_sal_console_out(str, len);
 #endif
 }